Patch pushed as 9223b81071ac5c18c94dce17c1fb6544016aac3d on
core-updates.