#10601 - back to where we were using better service definitions