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