Revert "Slight refactor to service status method."

This reverts commit 609353078e8ab9db85812ac2631d37143e6441b8.