Address post-commit review from r243378.