Revert suspicious patch to see if there are any issues without it.

This reverts commit 285df1be0c3ecd4f857d6a399477e146befc61ea.