Revert "PSD commit"

This reverts commit f60d63804540e5aca4d40219ef664c9b58d8477a.