Unreviewed, fix test failures after r242809.