Finish revert of r358672, missed in r358688.
Manual reverts never succeed correctly.
Reported by: luporl