Revert 7f8824d..d0ec337

This rolls back to commit 7f8824df02907d0a4c0e696aecf1398ce84631d6.
fix to the controller