Backed out changeset f74c9326b89c (bug 976247) because I landed the wrong patch :(