Backed out changesets 6bd00fa70b00, 4e2f8f3b8f6b, and c89fec9c8b55 (bug 879717) for introducting multiple new intermittent failures.

--HG--
extra : rebase_source : 4aad9383081f256484dd06e87f14cc82ecf186b5
Bug 1113313 - Rename these functions to better reflect what they do. r=billm

--HG--
extra : rebase_source : ae61b3dd6dd5ce50a131a640060d7be57e562e4d