Simplified even more. I have no idea what's making travis fail :(