This reverts commit 8030c64577. Reverted due to an accidental mass rebuild. Relanding on staging.
8030c64577