Comment 19 for bug 661460

or can we make it so the library is a runtime or compile-time selectable option? That way the new code can live in the tree but we don't lose the working one