This reverts commit 88c6be88, since it is no longer needed after fixing the root cause in a076da41.
88c6be88