Store block counter in App
Revert "Store block counter in App"

This reverts commit 8077d45f7d7eb7cde35abd337232409b98c3d79a.