Revert some deprecated use of Field