Common: Remove 'singleton maker'

See ef4ba0e4df220cabf04eae5b637a0970ebda39b9 for rationale.