Removed access-violation patch, fixed upstream