This reverts commit c299efbf28. Reason to revert: D142327 has been reverted which is depended by this change.
c299efbf28
$