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