Bug 1032557 - Synchronize logic for collections

https://bugzilla.mozilla.org/show_bug.cgi?id=1032557