Roll-back of #503982 which caused test failures. One day, I will learn that not even a *one word* patch is immune from causing test failures.