Temporary workaround to refcount bugs exposed by r2792