Revert "Merge branch 'origin/UserBundle'"

This reverts commit 82c29c46b20f3884eada426710957f59f41088cb, reversing
changes made to a7b6662795360f1fa543710c6db15a9a1afba60a.