CFY-1230 reverted previous commit