Patch by James Robinson <jamesr@chromium.org> on 2011-07-13