Applied patch from GENI by Aaron Helsinger