Backed out changeset a89f08f4fd3e (bug 959089)
Backed out changeset ffe32dd3b558 (bug 959089) for assertions