Revert 0789245f1385eec549765d91390d86431722cf8d because it was really broken, despite its promises; add a more interesting way of handling the Phing 2.4+ problem that fixes #1280 and refs #1216, #1231