Even though the regression is somehow caused by 03a80facfc this value shouldn't be reused so apply an unrelated fix.
03a80facfc