Partial revert of r45109, r45116 -- removing the forced 'x' prefix from IDs not begin...