BISERVER-101054 - Reverting to the old tree call