Added a fix.
Revert "Added a fix."

This reverts commit 2596934a96f235841993eccc3b441c8554971f03.