Merge "Revert SQLiteQueryBuilder for now."