Reverted my last change. Got a bit too zealous there.