Fixing horrid commit history to move back to Linux