Change in mom[master]: Remove Collector.instance