REVERT: "Update height choice when upgrading a building.  Eliminate now-redundant functions." unless REPLACE_BUILDINGS is defined. The intention of this is to narrow down the memory corruption issues.