Revert "Fix no longer appears to be necessary."

This reverts commit deeec94bad76b5f57365275561f9cfa3f658daf7.