Reverted lint cleanup that caused GWT compile error in webapp.