Revert "Rollback fix."

This reverts commit 124d855ec798e6e628b3dd813260762b02d6fe25.