This reverts commit bedf0279a9 after the tests fail due to overlapping mocks in shippable.
bedf0279a9