Revert "Merge branch 'R-travis' into develop"

This reverts commit 8886621ed0388d06dab468e3234de44893e3750a, reversing
changes made to e4ae2ee29afa60eb7a5e706ccecc23e055c1aff0.