This patch brings back the expected services. Patch works as intended.