Revert "Merge pull request #9468 from gaye/sinonjs"

This reverts commit 728f181b510c540131614768289f93e90e709d61, reversing
changes made to 7e9e06a7e6c2613cb8c5b279455826f4cb3548fc.
Merge pull request #9552 from lightsofapollo/revert-sinon

Revert "Merge pull request #9468 from gaye/sinonjs"