Revert "Fix MAX_CHAIN_LEN application"

This reverts commit 11e0ecf7175ecdbadf9c838b8cff9c7e94d97a91.