Revert to previous Controller config

Restore previous version, minus function wrapper