Backing out 2a19516ee700 (bug 912908) for causing bug 915536, rs=ttaubert over IRC