Revert "Revert "R0343006""

This reverts commit 75e37b059859f6b39887a4211ee4f67103bf560e.