Move ENT_SUBSTITUTE shim