diff --git a/ocis/pkg/command/revastoragemetadata.go b/ocis/pkg/command/revastoragemetadata.go
index 18d80abb2f..61c7af1125 100644
--- a/ocis/pkg/command/revastoragemetadata.go
+++ b/ocis/pkg/command/revastoragemetadata.go
@@ -1,5 +1,3 @@
-// +build !simple
-
 package command
 
 import (
diff --git a/ocis/pkg/runtime/runtime.go b/ocis/pkg/runtime/runtime.go
index 8cd8d0332d..0733b8ee0e 100644
--- a/ocis/pkg/runtime/runtime.go
+++ b/ocis/pkg/runtime/runtime.go
@@ -122,13 +122,14 @@ OUT:
 }
 
 // RunService sends a Service.Start command with the given service name  to pman
-func RunService(client *rpc.Client, service string) (reply int) {
+func RunService(client *rpc.Client, service string) int {
 	args := process.NewProcEntry(service, os.Environ(), []string{service}...)
 
+	var reply int
 	if err := client.Call("Service.Start", args, &reply); err != nil {
 		golog.Fatal(err)
 	}
-	return
+	return reply
 }
 
 // AddMicroPlatform adds the micro subcommands to the cli app