Cleanup after https://github.com/toolkitchen/mdv/commit/7f93f760bf7db60ee7c31cb8ab3d2c31eda16064

R=arv
BUG=

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