Revert "Replace (slower) block.call with (faster) yield"

This reverts commit 0ab075e75f58bf403f7ebe20546c7005f35db1f6.