Revert "(Finally) move sqlite3 to separate checks" as suggested by @rubenk.

This reverts commit 01b94816efbc70f185c94202c6d1c9191cb916f4.