#363 has been implicated in a glitch in the docker template system. While I cannot replicate the issue at all, revert the PR as the edge case issue that it solved has only ever occurred during synthetic tests.