This satisfies #1913 (https://labs.riseup.net/code/issues/1913)