Make sure to obsolete ndServiceRegistry