impossible to patch Remi contrib; re-apply his modifications direclty to fix request GH-110