[PATCH] Workaround CAPI subsystem locking issue