Backed out changeset f786dcb23eca (bug 1092156)
Backed out changeset 9fa06a2e1a98 (bug 1092156) for breaking nightly builds