If this is just being used to fix a test, I'd be inclined to just change the test rather than introducing this backport.