Rollback to initial commit - my last commit wasn't really a merge. Hmm...