Partially revert marcoll pull requeust since it causes crashes and memory leaks.