FL-1660: Enable deprecated functionality by default