Note that this requires #77572 and #77571.

Other than this, LFTM.