Fix test failures on develop

The changes in #15098 introduced an issue addressed in #15826, which then caused a test failure with `integration.shell.call.CallTest.test_issue_14979_output_file_permissions` on the develop branch.

@thatch45 said to comment out that test line for now. @s0undt3ch the test was your code - can you take a look at how to properly address this issue?