a little more cleanup post merge.  Removing windows bypass on snapshot-based repair as that works on trunk