Revert "workaround for problems in new travis build environment"

This reverts commit 80ffdf9981a91fa3762e21123187e4f596e9a0d8.