Revert 877e553..ba97227

This rolls back to commit 877e5534fb0264553d681a38e22d374f24b18cb5.
rid of default controllers