This is primarily to align with similar changes applied to ContentDisposition in 5.x. Closes gh-24580