Backout changeset 452390823d77 from bug 916537, patch did not fix the issue. a=philipp