reapply r82348 with a fix, thanks Jeffrey.