Revert "Replaced Controller"

This reverts commit ff58c9f6e9ba4d98cd7a200f1dad4e688a662ae1.