Revert "R0343006"

This reverts commit 7c89682ccc8042d8b9a4ad35306727b63d26a9ef.