Fix deb build, remove a bad merge from the previous committer

Change-Id: Ib9c68b0f293d40d6bb8ef53edbdb654269ae3be2