cleaning up the fix for #1821
cleaning up the fix for #1821

* reverts part of 5a886bd

cjohansen/Sinon.JS,cjohansen/Sinon.JS,mroderick/Sinon.JS,fatso83/Sinon.JS,fatso83/Sinon.JS,fatso83/Sinon.JS,mroderick/Sinon.JS,mroderick/Sinon.JS,cjohansen/Sinon.JS