Fix embarassment perpetrated in 97f0e3842c04.
Merge bug25689 (again)
stable to default