Revert "Crazy DataSource that manages empty sections"

This reverts commit 4dafd09d3d8740912d66f996d1fdbaabd6d2d82e.