revert to lib-extra