Change includsion order of build.xxx.properties again