undo auth-avoiding hacks