Stop relying on rbbe