Revert workaround since it did not resolve the issue.

This reverts commit c84856d87b5eecfe6a496e5d53beb867b0eced9f.