Follow up r71553: (update magic words)