Merge pull request #1730 from comex/suaero Remove the one commit (as far as I can tell) by soreau that added nontrivial material still in the tree
