rebase patch
remove ATS from build