I thought we were working towards a single set of blocks shared between both 2.1 and 2.2? If that is the case, we can't deprecate a block in 2.2 and not in 2.1, at least not at the moment. We'd need a cleverer build system, say one that knows which blocks to include from within the blocks repository.
We are not there yet, and some blocks differ between 2.1 and 2.2. Anyway, what's your vote? :)
Vadim
