Add back in BufOnly mapping