Revert "r8122"

This reverts commit 7b6884a0445af0f0e330e1733b1740554470c687.