Reapply small changes that were dropped when we updated the history
TBR=nweiz,jakemac

Review URL: https://codereview.chromium.org//825493002