Adding keyword forward-compatibility because we want to put out a release with this fixed in it before putting out a release that removes the "rm" command entirely (#1827).