Looks like a patch will be the best tool to close this.
Here's an alternative, far to be perfect.