DF-185 reverted some changes from commit #3c0e0c5