Revert "Updated based on fusepool-vocab (fp)"

This reverts commit 209bb7383a2027ef775891dba9868fb2bde288f3.

XXX: Temporarily holding this back until September and
the new PATExpert namespace is sorted out.