[BISERVER-10656] Restoring some erroneously removed code during the Dojo merge