revert changes to speed up travis builds

[skip ci]