Reverted Tree memory leak fix since it is breaking Tree filtering in a way that only can be fixed by introducing new API to Filterable interface and this cannot be done in a maintenance release. #11053

Change-Id: I7967a4dc57ad2d06880917d4756107c3838d8491