First step in removing the pdo* covers.