Readds @jo commits on #232