Revert "Mantis Ticket 0004811"

This reverts commit ad53e4ce65d2338a86c46e7c13aa3738e8f3e0c6.