Port 1.X commit:
https://github.com/dojo/dojox/commit/12774a98c709acd65bd85e09d8beb7ea40e04d2d