First attempt at #264.