Revert special treatment for +postgres