Revert "Mantis Ticket 0004515"

This reverts commit 192e1e056359a55889e3651a6f75fc434c34dc2b.