f1ca5288 was a cherry-pick that was merged incorrectly after
some conflicts. This was causing a very serious crasher in Chrome.

BUG=chromium:730126
BUG=chromium:735986

Change-Id: I82a48c25d604e1088800cb870297ccfef5915fc5
Reviewed-on: https://chromium-review.googlesource.com/544541Reviewed-by: Jamie Madill <jmadill@chromium.org>