Does this break scenarios that worked prior to this PR?