Temporary fix for travis pull request, revert these changes after code review has been completed.