rDCS95987b92f8e5

[ci skip] Revert "[ci skip] Temp rewrite"

This reverts commit f56783659bb147a0310745ef4368a39193315d6a.