revert data workaround