Couple changes after merge fail.
(cherry picked from commit 1a070bb)