Probably a really, really, bad thing. This needs to be refactored
Merge branch 'hotfix/temporary_badness'