Revert "s3/s4: Move CONST_DISCARD into lib/util so it's available from s3 and s4"