Backed out changeset 6dcc6fc612e4 (bug 914180) for it was intended for Aurora only.