DONT MERGE: Trying to fix travis build, trying to find which commit broke the build