This reverts commit a07e0252. Reason for revert: Breaks build Exempt-From-Owner-Approval: revert to fix build breakage Change-Id: Ice06ab93dc2836c69aeef68558dc07a6a25593ec