undoing hacky nonsense