Comment 2 for bug 347066

I committed a fix for this by just using the built-in Add and Remove transaction methods. Although now it requires a query per transaction, it is cleaner as it doesn't require changes to persistentstore. If you are able to identify the issue with the old method though, it may be better to use that and require only one query.