modified for (now old) cornell-pl/netkat changes