New tree build info v2
Revert "New tree build info v2"

This reverts commit 8cc3943dda675ffb9bc7e64d9301b0993371f46c.
Merge remote-tracking branch 'slim/kk4.4' into w03