CAPI: revert #40, which could cause inconsistent object lifetime behavior