Revert claw/maw change, wont work