This is what I actually suggested in #796