Revert broken logic

This commit appears to have broken the pipeline. Revert whilst we reconsider the approach to take.

This reverts commit 732128be.