Revert "KNOWN BAD CHANGE - it should cause lint failures (but doesn't??)."

This reverts commit fc9875f53748665e964366601cb1d85e6e559bfb.

Reason for revert: known to be bad.

Change-Id: I9b8db53c054119f454e50007f56232312a0ba595
1 file changed