Cleaning up FieldConfigs for #664 - again