This commit was originally because it was suspected to cause a crash, but a reproducer did not surface. A crash that was exposed by this change was fixed in 1d8f2e52. This reverts the revert commit 0581c0b0.
