Fixing a huge git muck-up