Revert "typo"

This reverts commit 03175c7b8e4e727e81f67e94c43e81b769ca1d0c.
Revert "next small tweak"

This reverts commit d617353889fca553cad42d3ff3ac499d7a09aa61.
Revert "Try to keep default merkle tree implementation"

This reverts commit a31e8f3fc07f88892723b3b42dd93c837502d032.