diff --git a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
index 6d8a0f2..7da8638 100644
--- a/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/BaseJpaRestfulServer.java
@@ -78,11 +78,11 @@ public class BaseJpaRestfulServer extends RestfulServer {
   BulkDataExportProvider bulkDataExportProvider;
   @Autowired
   PartitionManagementProvider partitionManagementProvider;
-	//TODO GGG RE-ADD ONCE FIXED IN HAPI-FHIR
-//	@Autowired
-//  ValueSetOperationProvider valueSetOperationProvider;
-   @Autowired
-	ReindexProvider reindexProvider;
+
+  @Autowired
+  ValueSetOperationProvider valueSetOperationProvider;
+  @Autowired
+  ReindexProvider reindexProvider;
   @Autowired
   BinaryStorageInterceptor binaryStorageInterceptor;
   @Autowired