Backport https://github.com/belighted/bennett/commit/23eceaaac68bddd557965b13188b0c73337e249b from master. Really need to find a better way to do this (merge conflicts aplenty when we update) but for such a single, annoying issue this will suffice.