Reverted services.py back to 60f2bd328920cc024eb463e30f05700305585564