Use new bz-layout.