Felt the additional thread when we've come to the consensus that it should perhaps be optional already.