Pg2.5.1 update

Backing out of some changes made while trying to reduce the  number of error messages in the log