revert well-meaning but useless and breaking "cleanup" change