Import a security patch from the mainline which changes the default behaviour