Revert "Merge branch 'Custom-User-Fields'"

This reverts commit 94a4a70c6b4080582cb5179eea729eabb5c0abf5, reversing
changes made to 20cd3b236df8fbd82a2600464579aaeda597c93a.