#1417 Undoing addressfieldpatch due to issues