Revert "R0331012"

This reverts commit c0dafe82a2cdfc448d82cb470219277252bc673a.