Revert "Work around managedObjectContext bug."

This reverts commit f04ae037b53e32588852a71c3b29340be640f9a8.