Revert commit 186833 (no longer needed after the fix in 186859).