Revert some change from XD
Fix by XPOS team