BISERVER-10154 - Reverting some of the changes, until UI work is done for getChildren