Revert "Try without block parsing"

This reverts commit 9afdfafeaad0c6894c3a585dcd731fe770df33bd.