Temporarily re-enable the work-around to test travis