Bug 836415 - Kill PFS. r=bsmedberg