Partially undoing some possibly licensing issues.