Revert "Fixup psh datastore"

This reverts commit aa64f5cd5817b84297f6c3970e09322904b6d45e.
I am a git genius
Merge remote-tracking branch 'origin/ms13-005' into ms13-005