This reverts commit e1651717324e8e17052380c55d8755305552ac9b. This was submitted by accident.
Block::computeBlockNumber
make_scope_exit