FL-1549: FL-1803: revert to make-3 to fix various build issues.