Pull Request for Issue620

Probably safe to remove this code.