How is this related to [CRUNCH-82](https://issues.apache.org/jira/browse/CRUNCH-82)? Would be good to note why it is safer with this and under what conditions it can be removed.