Revert "Fix issue with incorrect controllerdef access check," because it made
a few tests fail.  (I agree it shouldn't have, but I'm not digging into why.)

This reverts commit 2b52b3e61ca8439c3c4768566f56c77c7d6a0442.
Merging origin/fabbott/master-pending/revert1523 into master