reapplying #403

Closed acholyn closed 1 year ago