Nuke some dupe code. Makes it easier to refactor into a core option or something.
Whoops, forgot re-removing that.