Revert unwanted changes to build script.
Test hpr and remove some debug output.