Removed one more obsolete build setting, turned on combining images