Revert "Minor build id cleanup"

This reverts commit 877be7b33e585b88106fa19232c0c0897c75ba88.

Accidentally included a whole bunch of debugging stuff.
Minor build id cleanup