refs #1645 : revert commit for different ticket.