This reverts commit 8151c0f65386c10cee51906772bc21a0fb1c7c3f. Dependent package are not ready for this yet.