removed crap stuff in set_master, not used by 5.6