remove duplicate code ... code was pushed into _library_ext modules
build from r46815