*headdesk* Undo stupid fix, and replace with accurate fix