Revert "Trim empty blocks"

This reverts commit 5b27d2166133f6409c9bfd40b8fe5a6992082a14.