Remove the #if 0 around the "suspect" code now that paratest has passed