Rolled back original compare code