Revert "#1009 Cleaned up typemaps"

This reverts commit ab3a4d7ffc5b25aa28eefa70c43cdf4ee57f2a65.