Fix bug introduced in recent cleanup.