Revert "Mantis Ticket - 5928"

This reverts commit cc8dee9d2c85f1481fa67e5621de7c8c56f6a8e8.