Revert security fix to prevent data corruption