revert roeblatt3's changes causing build errors