Revert "Mantis Ticket 5928"

This reverts commit 7b10397250638ad66b6c1c23b11ee3986b69dab0.