This reverts commit 63df7cb2e4. It seems this caused unintended failures on master, will resubmit after CI is green
63df7cb2e4