Fix BUILDID getting appended even if not set.