Revert 7c91cb1..26d6f6e

This rolls back to commit 7c91cb144ce1997a733cb2a5362dcbb4de5c5460.
sqlite3 second try