Oops, that might not exist
Merge bug26480 (again)