Revert "Fix tracking for version"

This reverts commit d69ae1f3ac97404831da292145ad843574a14579.

Change-Id: Ic724f6fe1b1cbc969ac195762bdf517e129cd9dd