Removed the WeakObjectIdDict and rebased.