Revert "Merge branch 'master' of https://github.com/marvingreenberg/swig"

This reverts commit 87bfa4ab6e4a8b74e77713b75ec09ea192666e31, reversing
changes made to 44eeb340a7106bc32259621b2db93ca7eed2c9c8.
Revert "Combine changes to be noop"

This reverts commit 44eeb340a7106bc32259621b2db93ca7eed2c9c8.
Revert "# This is a combination of 2 commits."

This reverts commit c980dec1af042ca0800f3a9b5436150a5fba381e.