Revert "Switch back to normal travis image"

This reverts commit cf7e0c74da14b03d8777a1b1f23931d4483c1bf5.