Remove dependency to activationd to avoid cyclic dep