Reforked from latest, applied change.  All tests pass.