Reverted the deletion on all other places