Revert to old ReentrancyGuard implementation

contracts/utils/contracts/src/ReentrancyGuard.sol

@@ -24,22 +24,26 @@ import "./LibRichErrors.sol";
 
 contract ReentrancyGuard {
 
-    // Mutex counter.
+    // Locked state of mutex.
-    // Starts at 1 and increases whenever a nonReentrant function is called.
+    bool private locked = false;
-    uint256 private reentrancyGuardCounter = 1;
 
-    /// @dev Functions with this modifer cannot be reentered.
+    /// @dev Functions with this modifer cannot be reentered. The mutex will be locked
+    ///      before function execution and unlocked after.
     modifier nonReentrant() {
-        // Increment and remember the current counter value.
+        // Ensure mutex is unlocked.
-        uint256 localCounter = ++reentrancyGuardCounter;
+        if (locked) {
-        // Call the function.
-        _;
-        // If the counter value is different from what we remember, the function
-        // was called more than once and an illegal reentrancy occured.
-        if (localCounter != reentrancyGuardCounter) {
             LibRichErrors.rrevert(
                 LibReentrancyGuardRichErrors.IllegalReentrancyError()
             );
         }
+
+        // Lock mutex before function call
+        locked = true;
+
+        // Perform function call
+        _;
+
+        // Unlock mutex after function call
+        locked = false;
     }
 }

contracts/utils/contracts/test/TestReentrancyGuard.sol

@@ -24,8 +24,6 @@ import "../src/ReentrancyGuard.sol";
 contract TestReentrancyGuard is
     ReentrancyGuard
 {
-    uint256 internal counter = 2;
-
     /// @dev Exposes the nonReentrant modifier publicly.
     /// @param shouldBeAttacked True if the contract should be attacked.
     /// @return True if successful.
@@ -47,19 +45,14 @@ contract TestReentrancyGuard is
         external
         returns (bool)
     {
-        if (counter > 0) {
+        return this.guarded(true);
-            counter--;
-            this.guarded(true);
-        } else {
-            counter = 2;
-            return true;
-        }
     }
 
     /// @dev This is a function that will not reenter the current contract.
     /// @return True if successful.
     function nonExploitive()
         external
+        pure
         returns (bool)
     {
         return true;