Switch to CB modules system; remove patch; update revisions