Reintroduce #92

No that we've merged #97, it's time to merge #92.