Backed out changeset b86c8fc67f5b (bug 873937) for causing bug 895976.