Revert today's mess - I'm going to do this properly.