Reverting attempt to fix travis build errors, because it busted it even harder.
Reverting attempt to fix travis build errors, because it busted it even harder.

troykinsella/junkie,troykinsella/junkie,troykinsella/junkie