This is one more fallout from fdo#42407, which is still incomplete.

Change-Id: Ie47f06be598ce5236c45bd3750ea7a21fd98175c