Revert "Partial fix for multiple sections in view"

This reverts commit d9bb3947742c9eab99dcef5e55571c4a329ba49f.