Log Message: Restore some previous changes lost in the last commit. Fixes a bulk build error pointed out by wiz@.