diff --git a/src/main/java/com/compuware/jenkins/build/RemoteSystemProperties.java b/src/main/java/com/compuware/jenkins/build/RemoteSystemProperties.java
index a0ec473..c46cf26 100644
--- a/src/main/java/com/compuware/jenkins/build/RemoteSystemProperties.java
+++ b/src/main/java/com/compuware/jenkins/build/RemoteSystemProperties.java
@@ -2,6 +2,7 @@
  * The MIT License (MIT)
  * 
  * Copyright (c) 2016, 2017 Compuware Corporation
+ * (c) Copyright 2016-2017, 2022 BMC Software, Inc.
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation
  * files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy,
@@ -16,28 +17,18 @@
  */
 package com.compuware.jenkins.build;
 
-import hudson.remoting.Callable;
 import java.util.Properties;
-import org.jenkinsci.remoting.RoleChecker;
+
+import jenkins.security.MasterToSlaveCallable;
 
 /**
  * Get remote system properties
  */
-public class RemoteSystemProperties implements Callable<Properties, RuntimeException>
-{
+public class RemoteSystemProperties extends MasterToSlaveCallable<Properties, RuntimeException> {
+
 	private static final long serialVersionUID = 1859119186947852696L;
 
-	public Properties call()
-	{
+	public Properties call() {
 		return System.getProperties();
 	}
-
-	/* (non-Javadoc)
-	 * @see org.jenkinsci.remoting.RoleSensitive#checkRoles(org.jenkinsci.remoting.RoleChecker)
-	 */
-	@Override
-	public void checkRoles(RoleChecker checker)
-	{
-		// Implementation required by interface, but not using
-	}
 }