Revert "Get around 2378459."

This reverts commit a3f7c0f3e39dbd2450064b66b27ccc719fc9e12f.