Fix: cib: Switch over completely to the new ACL code