dbc615e862
PR #1708 was Tech LGTM'ed, but the CLA needed to be re-signed (the new CLA needed to be signed), so I'm reimplementing the changes here.