This reverts commit 8708c9c6. Reason for revert: Breaks errorprone build Change-Id: Ic923d241b27365bb9845d3d8dff67d485116424d