Fix horrible refactor.