Revert "https://bugs.dojotoolkit.org/ticket/17615"

This reverts commit 823b2a2de19202a2de096b97198d50d2b5c5b9c6.