Update per codereview: https://codereview.chromium.org/85333007/#ps1