Get rid of ESCAPE_PATCH ifdef, as its on by default, and there is no
apparent reason for turning it off...it fixes a bug