Duplicate symbols are easily avoided by removing duplicate code.

Change-Id: I9b598a44156d6ff71b0691e69ab8163b15e2e26f