Re-add the replace-commands feature