Removed the contrib directory from the file search for bug #8365.