[#14] Use source.organization again after fix in 949bb6f