Backed out changeset fed128eb92f3 (bug 836605) for making the IDL gods angry. CLOSED TREE