Revert to OpenResty
Trying to fix merge conflict