Patch to follow.
Created attachment 79584 [details] [PATCH] Proposed change
Landed as r76231 and 76233.