Revert "More field fixes"

This reverts commit eb70105997a663c4ef1bc45cc9ab887c6504d311.