keep this but mark .. deprecated:: 1.7 ?