Merge "Revert "Generate deprecation warning for postgresql""