[JBJCA-1128] returnConnection doesn't prefill upon kill
[JBJCA-1128] Revert prefill part