Revert "Optimize Kitchen 'noservices' option"

This reverts commit 3519811c2c67090ce88b5533164e57f0e6ab966a.
6 files changed