Revert "Merge branch 'master' into AdminBundle"

This reverts commit c9194835620013baea7e5a571c123df46042dde5, reversing
changes made to 83e513347ae415b15e093c8fe98b6dafeeafc306.