Done: https://github.com/hypothesis/h/commit/6105c2c42edf036494686ce599365bb6d4b01d07