Reverting end/data event listeners