Fixed 2.x -> 3.x upgrade where features_revert was before field_change