Reverting changes made in #717.

Temporary fix to get pipelines flowing again.

fixes #718