Revert General Section add to fix null pointer crash