Re-introduce block API everywhere.