Reverted ticket #37, phone number field changes