Don't use lbd_layout on the oa branch.