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

This reverts commit aefaa9f28dfcb6f013d40585e4e9bbd2eeba296b.