This reverts commit e89e8dcf. Some configurations still have references to discarded sections. I'm reverting until these can be addressed.