Revert "Merge pull request #13300 from davidflanagan/bug915001hd"

This reverts commit d19550e2fb7331d5e4a54e8e998753378e7fd44a, reversing
changes made to bc2fae70e6511096a067576a29f4b9750929dca0.
Merge pull request #13395 from davidflanagan/bug915001hd-revert

Revert "Merge pull request #13300 from davidflanagan/bug915001hd"