port modification to remove conflicts so Jamie can run bin/test_driver -b