Don't we still want this? What was the motivation for removal?