fix merge, this code was already in there and mangled by switch timestamp stuff