Revert "workaround for problems in new travis build environment"

This reverts commit 20d5ef97a7c2569d9280be86f98c2d842d3496be.