Revert data-watch handler to simpler version.