This reverts commit 365d4b0cc8b21204e6e093bf910d53d3673f113c.
Fix preflight breakage, this seems like the most possible cause. Will recommit if not.
BUG=
TEST=
Review URL: http://codereview.chromium.org/3767012
Change-Id: I93fe463fec77c445e7ff0ec86db25d5ef2997ad7