Backout 87b5e35236ef (bug 931746) breaks UI tests