Revert "Reverts wrong commit."

This reverts commit e3c18a42f78e9d9011670330c7acc4a1432e98c6.