Axe some logic that was switched around