Revert "Add core data workaround."

This reverts commit b1da02bcff9624d432b27435db3a7965d18823f5.