Revert "Make the controller replacable to allow testing with variants"

This reverts commit 418ba8b346619106bf733242aab6e56b961f964e.