Revert "Attempt to straighten out type_traits "development" commits" again

This reverts commit 09704e498d2109d1a455055d143b7d3a8b7caa0c.