In theory, legacy/trac#32883 (moved) was a better solution for the problem that legacy/trac#32778 (moved) was supposed to solve. In practice, it seems to break nt services on master. We should revert it for now until we have time to debug it in a later alpha series.