CFY-557 restore stuff that was removed by mistake