Revert "controller 2 again"

This reverts commit 6cece656075055a8c8a985eb819063fe19b05c8d.