Revised patch for FLEX-33772