Added "old-style" prefix checks, will once again look at the database.