Revert "Merge pull request #2393 from andymckay/deux-versions"
Revert "Merge pull request #2393 from andymckay/deux-versions"

This reverts commit 46abc12c86e5c299150ce7301862f93f8e11d8c3, reversing
changes made to f04660129d2be76ea6ef310f409e304ebfbbd3fa.

elysium001/zamboni,ddurst/zamboni,ayushagrawal288/zamboni,diox/zamboni,Hitechverma/zamboni,tsl143/zamboni,luckylavish/zamboni,washort/zamboni,elysium001/zamboni,mudithkr/zamboni,washort/zamboni,shahbaz17/zamboni,andymckay/zamboni,shahbaz17/zamboni,tsl143/zamboni,kumar303/zamboni,eviljeff/zamboni,mstriemer/zamboni,tsl143/zamboni,diox/zamboni,mozilla/zamboni,jamesthechamp/zamboni,washort/zamboni,mstriemer/zamboni,mozilla/zamboni,mudithkr/zamboni,elysium001/zamboni,ddurst/zamboni,diox/zamboni,clouserw/zamboni,ddurst/zamboni,Hitechverma/zamboni,eviljeff/zamboni,eviljeff/zamboni,ingenioustechie/zamboni,clouserw/zamboni,mudithkr/zamboni,luckylavish/zamboni,ddurst/zamboni,luckylavish/zamboni,jamesthechamp/zamboni,ayushagrawal288/zamboni,jasonthomas/zamboni,ingenioustechie/zamboni,Jobava/zamboni,eviljeff/zamboni,mozilla/zamboni,ayushagrawal288/zamboni,jasonthomas/zamboni,Jobava/zamboni,jamesthechamp/zamboni,shahbaz17/zamboni,mudithkr/zamboni,clouserw/zamboni,tsl143/zamboni,ngokevin/zamboni,ingenioustechie/zamboni,Hitechverma/zamboni,ngokevin/zamboni,ayushagrawal288/zamboni,kumar303/zamboni,ngokevin/zamboni,clouserw/zamboni,mstriemer/zamboni,shahbaz17/zamboni,andymckay/zamboni,elysium001/zamboni,Hitechverma/zamboni,jamesthechamp/zamboni,luckylavish/zamboni,mozilla/zamboni,mstriemer/zamboni,jasonthomas/zamboni,kumar303/zamboni,washort/zamboni,andymckay/zamboni,kumar303/zamboni,Jobava/zamboni,ingenioustechie/zamboni,diox/zamboni,jasonthomas/zamboni,Jobava/zamboni