cleanup after https://codereview.appspot.com/7229088/

BUG=

Review URL: https://codereview.appspot.com/7299051