Attempt at #342.