It's a new approach for fixing #21581, the rest of the changes in that file is a rollback to the original state. So this is covered by the test for #21581.