Revert "Final II update before new blockchain release"

This reverts commit 6d5eb398a9be33b2a06ece874706db259a313cde.
Revert "Revert "Final II update before new blockchain release""

This reverts commit 7e6283cfe74d8336b3d3c4ee157a343ae78558d1.