This reverts commit d7c32db9. Reason for revert: breaks builds b/323989166 Change-Id: I6937f2cbecbde39fcfe605937861510329ba44c3