This reverts commit 30704c1b. Reason for revert: breaks errorprone, b/182896753 Change-Id: I05f4e2dba321bc77713be701f76b07c66cb0d103