pure 0.58

Closes #24334.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>