Revert "R0331012"

This reverts commit 7b2ab18710db4de54ff4a99f94368bb788ac7a8c.