Created per Mantis ticket #4658 for Tom Raney