The delete/remove naming has caused endless confusion in the past. (cherry picked from commit 90fce8bfa621f8c3be6663d62740783949111ff1)
The delete/remove naming has caused endless confusion in the past. (cherry picked from commit 90fce8bfa621f8c3be6663d62740783949111ff1)