Revert "Merge pull request #11564 from lightsofapollo/travis-mc"

This reverts commit 52590b803ae2f40b1d89885808282706480495e7, reversing
changes made to 2d1a22ba93f044c74b08b3298f8a452bcd860fff.