This reverts commit 0a9e82b430, which didn't end up fixing anything. The problem was elsewhere; namely, using 'operating-system-services' instead of 'operating-system-user-services'.
0a9e82b430