Revert "Merge pull request #2081 from JasonGhent/3.8.x"

This reverts commit 7c274073434af0dd8136eafbf84597f61cff413c, reversing
changes made to 24609933d07cd224e69493f523f4e2c0b880f3e7.

Conflicts:
	package.json
Fix minor typo in package.json