Remove unnecessary PostgresDatabase workaround