DELTASPIKE-426 switch back to the initial approach

 (to keep one instance per component)