Revert "Revert "r0343010""

This reverts commit 7dbaae00cdba786d10ba7518bef438904b37b1e5.