backport commit for ant-build