undo hacks that didn't work