Backed out changeset 6612395041e3
bug 892122: Actually enable/disable the correct masters.