This does not remove the unstable field and still parses both.
Handling of the unstable field will need to be removed in the
future.