Improve e89a80e.