Bug 1078507 - undo unintended change to Makefile.master - r=bustage