Signed-off-by: Anders Kaseorg <andersk@mit.edu> (cherry picked from commit a681951902631d20e439fc60f53100967ba1cc72)