Revert "workaround for problems in new travis build environment"

This reverts commit 0c8b3b08162d1cb8d7d95787f45c5afbea81fb8b.