I kinda figured something like that. However it is pretty much a vital part of his core character so I wouldnt expect it to change too soon.