Backport Block code from 3.0 Kernel (OMFG)