Rolling back previous attempt at fixing travis build