One quick check-in after cleanup.

Something appears to be busted in the xhr module.