v3.8.1: still lots of debugging needed

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>