Issue #2190421 by amateescu: Fix some services that shouldn't be serialized.