Backport #223 to 0.7.x

For some reason the tests were hanging for me locally (testing remote-file?), so not sure if this passes tests, but the change does work - tested service defs from resources/pallet_services.