This reverts commit f25826211b. Not an issue on the account-mgmt branch. We can do without this hack.
f25826211b