Backed out changeset 7cff27cb2845 (bug 975011), for breaking just about everything not on tbpl

--HG--
extra : rebase_source : 740fc0d5cd27b0cc7d06ce9f9c2f848c9d071b20