Reverted when.js and promises - they conflict with buster-browser tests