Revert bad changes to data mutability