Revert r2d6bc04 for Travis