Revert "Remove all-encasing PSQT entries"

This reverts commit a27a1c265e8f8d514a35398505c42a9d641aa382.