6d87bf04d0
This reverts commit e76874f5138224df474f7ad1f76adcdba5bc9069. This slows down some ops that were much faster before; will use another approach.