First attempt at #125.