Revert change to ManagedContextTimerTask to unblock DB upgrade