revert some refactoring in servicemaker.py