import commit 4dc9b5ffc904eb888dd71f6320e6cbe27986ef8f from try-morgue