Clean up the leftover of strigi removal

This is a follow up of commit 56ae345ad143a4101eebbe70f176a730c594e207

REVIEW: 114148