Might be easiest to propose a new patch that addresses this.