Back out two changes that got separate bugs - CustomEvent and xhr.addEventListener