GPII-526: Removed the XXXEnabled wrapping from the solutions registry as it's no longer needed