backout a5e4cf95c43e (bug 903426) because its parent breaks a test.
backout e068a99474a6 (bug 903426) because it breaks a test.