Applying 11_26_car_tyan.diff from Yinghai Lu. NOTE: This will break the tree so it can be fixed up later