DO NOT SYNC THIS!
Revert "DO NOT SYNC THIS!"

This reverts commit 19b0e3252a442a6bcdb2a2b475ee8bafa010a962.