First attempt at #92.