revert last commit; don't require pg_user
Merge branch 'hotfix/1.2.4.a'