revert half of the last commit; was overzealous about warning squashing