Task#5003 - Reverted task#4827 modification.
Merge pull request #246 from bvcosta/task5003

Task#5003 - Reverted task#4827 modification.