Reverted to previous versions in preparation for adding phantomJS support.