Reverted the changes to AUStateField again.