Another attempt at #116.