This reverts commit c0d49db8. Reason for revert: We are using a flag instead. Change-Id: I22c8b9a8c64e4e0416813b02e99202cf036db598