diff --git a/servers/rest_server/rest_server.module b/servers/rest_server/rest_server.module
index 25c3e76..a033ead 100755
--- a/servers/rest_server/rest_server.module
+++ b/servers/rest_server/rest_server.module
@@ -219,18 +219,14 @@ function rest_server_services_resources_alter(&$resources, $endpoint) {
  * @return the location of the spyc library, if it exists; else return false.
  */
 function _rest_server_get_spyc_location() {
-  if (function_exists('libraries_get_path')) {
-    $libraries_spyc_loc = libraries_get_path('spyc') . '/spyc.php'; 
-  } else {
-    return false;
+  if (function_exists('libraries_get_path')) {   
+    $libraries_spyc_loc = libraries_get_path('spyc') . '/spyc.php';
+    if (file_exists($libraries_spyc_loc)) {   
+      return $libraries_spyc_loc; 
+    }  
   }
-  $services_spyc_loc = dirname(__FILE__) . '/lib/spyc.php';
 
-  if (file_exists($libraries_spyc_loc)) {
-    return $libraries_spyc_loc;
-  }
-  else if (file_exists($services_spyc_loc)) {
-    return $services_spyc_loc;
-  }
-  return false;
+  // Libraries not in use fall back to straight look up.
+  $services_spyc_loc = dirname(__FILE__) . '/lib/spyc.php'; 
+  return file_exists($services_spyc_loc) ? $services_spyc_loc : false;
 }