Backed out changeset 7b6b2d8dd79b (bug 1015547) for bustage.
Backed out changeset 16e5c41a0893 (bug 1015547) for bustage.