fix master, remove broken changed from my horrible horrible merge gone terribly wrong.  holy crap.