XD-625: Revert XD-624