Getting rid of the hack, no longer compiles... Deal with it