BAD quick non-fix -- revert and fix instead