Retesting after committing #3143656: Remove unnecessary field storage settings