Revert: Marked services as private