I am willing to break APIs for a master-only fix...Unless I am mistaken and this applies for 1.9.x code?