Revert 2fd085e..8675fed

This rolls back to commit 2fd085e56534783b64ba9c4cac7dbd0275f6d802.
Controller for videos