Revert the edge safety changes