Commit a missing piece of r364302.
This had failed to apply due to a merge conflict.
Reported by: Jenkins MFC with: r364302