Reverted r113688, r113691 per CR and filed #61440 upstream.