Apply Darrell Loverin's patch for FLEX-33322