Fix ToS/PP regression (bug 924857)