This is a spin-off bug 23296 to make review easier. Patch 6.
Created attachment 31075 [details] patch set 1
Comment on attachment 31075 [details] patch set 1 Seems sane enough.
Landed in @r44585.