Revert #2 security fix to prevent data corruption