Yep, this is correct. The only reason he won't remove his witness votes is because there have been no trustless guarantees that his stake won't be frozen again. @theycallmedan once that guarantee is made it seems clear to me that he will remove his votes. That trustless guarantee has not been made to him to this point.