Commit 65c656c resulted in double importing services, since this was already fixed in commmit 3c62626.