Revert "Merge pull request #8553 from keymanapp/revert-8549-chore/master-to-esmodule-merge-a17s9" This reverts commit 518750f9, reversing changes made to 6df63edd.