Task#5003 - Reverted task#4827 modification.