Cherry-picking commit that I made on the wrong branch.