Bug 909150, exclude right master