Fixed broken 1.6.4 branch after merge fail.