Revert "s3-includes: fixed CONST_DISCARD() to actually discard const"