Backed out changeset 5ecd0339a087 (bug 973143) because of a possible Talos regression