Removed 1080 changes and regressed to use codesorcery