Unbreak travis. Partial rollback of 1865c7d4518f6860d3d32722f0d1173c77476a95