Former heavyweight world champion Tyson Fury will face Arslanbek Makhmudov in his comeback fight in April, weeks after saying he would come out of retirement.