undo moz.build changes from before