Updated the fix. Using fix from @justinfagnani instead (https://codereview.chromium.org/105893010).