Revert "R0331012"

This reverts commit c0dafe82a2cdfc448d82cb470219277252bc673a.
Revert "Revert "R0331012""

This reverts commit 478e6cc7c99bb0873723c462d1eed7049c0ad9fe.