Revert: [BISERVER-10656] Dojo changes (3d3e3a57245af2e96eccfcb3054f2c72b15d18d4)