Revert previous reverted commits: issue seems to be CI infrastructure, not code

This reverts commit 13cf42a68f97f88fe9886c4c1d3aa2e95e46f0e3.
This reverts commit a2d1e3d6be88fb5cb3af7edde1ba98585a760f4b.