Revert fix for blocks count (do not want to break compatibility at the moment)