Now supports format detection again.