Backed out changesets a7fc463961ce and 65061e971eb8 (bug 935793) for breaking Travis testing (bug 950441).