Fix path apparently gone wrong by cherrypick.