Unreviewed, fix test failures after r243119.