Rearranged patches and outcommented problematic patch for commentsblock.