Revert "Merge remote-tracking branch 'libupstream/master' into phone-verification"

This reverts commit 91633fd52a4fd070a65fba47a51f346a08136482, reversing
changes made to 66930ff138702a2cba9d5b183b9b91a2e7be7fb3.
changed name of phone attribute to phone_number as in specifications