Land the first two commits of pull request #608.