Backed out changeset b9ba9a6b8a97 (bug 1004499) for bustage