Reland r223754

The commit is identical except a reference to `GV' should have been to
`GVal'.