Backed out changesets a8ba3f906023 and 59e38d576489 (bug 933483) for causing bug 946726. a=backout