revert with some additional tracking