Bring back our maint-v2 version of escaping/unescaping
Bring back our maint-v2 version of escaping/unescaping

berkus/cocotron,berkus/cocotron,berkus/cocotron,liruqi/cocotron,liruqi/cocotron,berkus/cocotron,liruqi/cocotron,liruqi/cocotron