looks like CI is still failing, even after reverting the recent PR. (CI on the PR of the revert succeeded!) Seems like an unrelated issue at this point