Revert core data move callback handling