Revert "Merge branch '4767_user_fields'"

This reverts commit bfe622fb39ec7468ec0579a245dd2c8e2cdee2fb, reversing
changes made to fb7d8c0c4050f8e03cb2acdf2926c1b5f1c11b99.