Fix pigeon system, which broke when REST system was redesigned