Switch back to upstream Travis helpers