Reverting DSN changes, issue #21