Backed out changeset c86a7dad496a (bug 967047) - only had f+, not r+