Revert "Merge branch 'New-Sections-Module'"

This reverts commit 6c1fac55078f41bac2358ab73354fa8e05ac948f, reversing
changes made to 95a75defe3838dadb4e36ff5f639a0205506f22b.
Revert "Revert "Merge branch 'New-Sections-Module'""

This reverts commit 350614dec1ce652d978c99ecf4f56aa203882b25.