Reverted to correct controller


This reverts commit ae864c97be10dc1cbae8de9f365c429849f7d6f5.