Partial revert of last commit to hopefully fix travis build