This reverts commit 2916ac43. This reverts commit 3d635f30. This reverts commit 61a21205. This change broke the Grunt build.