Revert "Comment out some code that is slow, use the alternate"

This reverts commit e6c8b4ebdc80a02bc2446c68821a35ebf47510b8.

Looks like I've mostly got the reasons for this taken care of.  Still a bit more to go, but almost there