A bit confused, what's the motivation for this change?