Part of #43035.
Part of #43035.