Revert "Merge pull request #18302 from zbraniecki/995425-upgrade-sinon"

This reverts commit 9869eaa311e54248140731955496d44d1f578943, reversing
changes made to 7591e9dc782ac2e97d63a96f9deb71c7b3588328.