Should this block move to the compat package?