Reverted last commit of Ricardo. The change led to unavoidable crashs in many X confi...