Revert "Merge branch 'refs/heads/pipeline-refactor'"
Revert "Merge branch 'refs/heads/pipeline-refactor'"

This reverts commit 54e3067efe15ab2f28c6f3e926dd72b4aad02c15, reversing
changes made to d572278f1b54736f810b047c00d05dddaf252485.

jamesjun/spoke