Revert all changes to see if travis just doesn't like me.