Revert "Mantis Ticket 5928"

This reverts commit 2a8872653665f1fd44d72282c9249ffb7dd20eb8.