finish upstream implementation
finish upstream implementation

cleanup, use() is overloaded to restore old functionality

Signed-off-by: Petar Koretic <0bdc63247af490de2e3f3da15a8939ec28fc7d99@gmail.com>

qaap/recurse,xwalk/recurse