Bug 16424: Make the svc/bib service keep the existing framework code