public function findById($id, $draft = true)
    {
        if ($draft) {
            $this->setDraftVersionFilter(! $draft);
        }

        $blocks = $this->getRepository()->findById($id);

        if ($draft) {
            foreach ($blocks as $block) {
                if (null !== $revision = $this->revisionManager->getDraftRevision($block)) {
                    $this->revisionManager->revert($block, $revision);
                }
            }
        }

        return $blocks;
    }