diff --git a/pagure/__init__.py b/pagure/__init__.py
index 2c7fc2d..98f2705 100644
--- a/pagure/__init__.py
+++ b/pagure/__init__.py
@@ -401,29 +401,6 @@ def generate_user_key_files():
     pagure.lib.git.generate_gitolite_acls()
 
 
-def acquire_lock(function):
-    """ Flask decorator to indicate the repo needs to be locked.
-
-    This function reretrieves the flask.g.repo object, but this time requests
-    that the repo object gets locked.
-    This lock is retrieved in a way that actively waits until the lock is
-    acquired.
-    """
-    @wraps(function)
-    def decorated_function(*args, **kwargs):
-        set_variables(with_lock=True)
-        return function(*args, **kwargs)
-    return decorated_function
-
-
-def ensure_lock(repo):
-    """ Function to make sure that `repo` was retrieved locked. """
-    if not flask.g.repo_locked:
-        raise Exception('Repo was not locked')
-    if repo is not flask.g.repo:
-        raise Exception('Incorrect repo was locked')
-
-
 def login_required(function):
     """ Flask decorator to retrict access to logged in user.
     If the auth system is ``fas`` it will also require that the user sign
diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py
index b4c6ecb..31dc14a 100644
--- a/pagure/ui/fork.py
+++ b/pagure/ui/fork.py
@@ -30,8 +30,7 @@ import pagure.exceptions
 import pagure.lib
 import pagure.lib.git
 import pagure.forms
-from pagure import (APP, SESSION, login_required, __get_file_in_tree,
-                    acquire_lock)
+from pagure import (APP, SESSION, login_required, __get_file_in_tree)
 
 
 _log = logging.getLogger(__name__)
@@ -171,7 +170,6 @@ def request_pulls(repo, username=None, namespace=None):
     '/fork/<username>/<namespace>/<repo>/pull-request/<int:requestid>/')
 @APP.route(
     '/fork/<username>/<namespace>/<repo>/pull-request/<int:requestid>')
-@acquire_lock
 def request_pull(repo, requestid, username=None, namespace=None):
     """ Create a pull request with the changes from the fork into the project.
     """
@@ -261,7 +259,6 @@ def request_pull(repo, requestid, username=None, namespace=None):
 @APP.route('/fork/<username>/<repo>/pull-request/<int:requestid>.patch')
 @APP.route(
     '/fork/<username>/<namespace>/<repo>/pull-request/<int:requestid>.patch')
-@acquire_lock
 def request_pull_patch(repo, requestid, username=None, namespace=None):
     """ Returns the commits from the specified pull-request as patches.
     """
@@ -351,7 +348,6 @@ def request_pull_patch(repo, requestid, username=None, namespace=None):
     '/fork/<username>/<namespace>/<repo>/pull-request/<int:requestid>/edit',
     methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def request_pull_edit(repo, requestid, username=None, namespace=None):
     """ Edit the title of a pull-request.
     """
@@ -425,7 +421,6 @@ def request_pull_edit(repo, requestid, username=None, namespace=None):
     '/fork/<username>/<namespace>/<repo>/pull-request/<int:requestid>/'
     'comment/<commit>/<path:filename>/<row>', methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def pull_request_add_comment(
         repo, requestid, commit=None,
         filename=None, row=None, username=None, namespace=None):
@@ -513,7 +508,6 @@ def pull_request_add_comment(
     '/fork/<namespace>/<username>/<repo>/pull-request/<int:requestid>/'
     'comment/drop', methods=['POST'])
 @login_required
-@acquire_lock
 def pull_request_drop_comment(
         repo, requestid, username=None, namespace=None):
     """ Delete a comment of a pull-request.
@@ -587,7 +581,6 @@ def pull_request_drop_comment(
     '<int:requestid>/comment/<int:commentid>/edit',
     methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def pull_request_edit_comment(
         repo, requestid, commentid, username=None, namespace=None):
     """Edit comment of a pull request
@@ -674,7 +667,6 @@ def pull_request_edit_comment(
     '/fork/<username>/<namespace>/<repo>/pull-request/<int:requestid>/merge',
     methods=['POST'])
 @login_required
-@acquire_lock
 def merge_request_pull(repo, requestid, username=None, namespace=None):
     """ Create a pull request with the changes from the fork into the project.
     """
@@ -764,7 +756,6 @@ def merge_request_pull(repo, requestid, username=None, namespace=None):
     '/fork/<username>/<namespace>/<repo>/pull-request/cancel/<int:requestid>',
     methods=['POST'])
 @login_required
-@acquire_lock
 def cancel_request_pull(repo, requestid, username=None, namespace=None):
     """ Cancel a pull request.
     """
@@ -820,7 +811,6 @@ def cancel_request_pull(repo, requestid, username=None, namespace=None):
     '/fork/<username>/<namespace>/<repo>/pull-request/<int:requestid>/assign',
     methods=['POST'])
 @login_required
-@acquire_lock
 def set_assignee_requests(repo, requestid, username=None, namespace=None):
     ''' Assign a pull-request. '''
     repo = flask.g.repo
@@ -941,7 +931,6 @@ def fork_project(repo, username=None, namespace=None):
 @APP.route(
     '/fork/<username>/<namespace>/<repo>/diff/'
     '<path:branch_to>..<path:branch_from>', methods=('GET', 'POST'))
-@acquire_lock
 def new_request_pull(
         repo, branch_to, branch_from, username=None, namespace=None):
     """ Create a pull request with the changes from the fork into the project.
@@ -1088,7 +1077,6 @@ def new_request_pull(
     '/fork/<username>/<namespace>/<repo>/diff/remote',
     methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def new_remote_request_pull(repo, username=None, namespace=None):
     """ Create a pull request with the changes from a remote fork into the
         project.
@@ -1234,7 +1222,6 @@ def new_remote_request_pull(repo, username=None, namespace=None):
     '/fork_edit/fork/<username>/<namespace>/<repo>/edit/<path:branchname>/'
     'f/<path:filename>', methods=['POST'])
 @login_required
-@acquire_lock
 def fork_edit_file(
         repo, branchname, filename, username=None, namespace=None):
     """ Fork the project specified and open the specific file to edit
diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py
index 9cb2290..7d1687c 100644
--- a/pagure/ui/issues.py
+++ b/pagure/ui/issues.py
@@ -36,8 +36,7 @@ import pagure.lib
 import pagure.lib.encoding_utils
 import pagure.forms
 from pagure import (APP, SESSION, __get_file_in_tree,
-                    login_required, authenticated, urlpattern,
-                    acquire_lock)
+                    login_required, authenticated, urlpattern)
 
 
 _log = logging.getLogger(__name__)
@@ -70,7 +69,6 @@ _log = logging.getLogger(__name__)
     '/fork/<username>/<namespace>/<repo>/issue/<int:issueid>/update',
     methods=['GET', 'POST'])
 @login_required
-@acquire_lock
 def update_issue(repo, issueid, username=None, namespace=None):
     ''' Add a comment to an issue. '''
     is_js = flask.request.args.get('js', False)
@@ -379,7 +377,6 @@ def update_issue(repo, issueid, username=None, namespace=None):
     '/fork/<username>/<namespace>/<repo>/tag/<tag>/edit',
     methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def edit_tag(repo, tag, username=None, namespace=None):
     """ Edit the specified tag associated with the issues of a project.
     """
@@ -449,7 +446,6 @@ def edit_tag(repo, tag, username=None, namespace=None):
 @APP.route('/<repo>/update/tags', methods=['POST'])
 @APP.route('/<namespace>/<repo>/update/tags', methods=['POST'])
 @login_required
-@acquire_lock
 def update_tags(repo, username=None, namespace=None):
     """ Update the tags of a project.
     """
@@ -543,7 +539,6 @@ def update_tags(repo, username=None, namespace=None):
 @APP.route('/fork/<username>/<repo>/droptag/', methods=['POST'])
 @APP.route('/fork/<username>/<namespace>/<repo>/droptag/', methods=['POST'])
 @login_required
-@acquire_lock
 def remove_tag(repo, username=None, namespace=None):
     """ Remove the specified tag, associated with the issues, from the project.
     """
@@ -872,7 +867,6 @@ def view_roadmap(repo, username=None, namespace=None):
     '/fork/<username>/<namespace>/<repo>/new_issue',
     methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def new_issue(repo, username=None, namespace=None):
     """ Create a new issue
     """
@@ -1053,7 +1047,6 @@ def view_issue(repo, issueid, username=None, namespace=None):
            methods=['POST'])
 @APP.route('/fork/<username>/<namespace>/<repo>/issue/<int:issueid>/drop',
            methods=['POST'])
-@acquire_lock
 def delete_issue(repo, issueid, username=None, namespace=None):
     """ Delete the specified issue
     """
@@ -1113,7 +1106,6 @@ def delete_issue(repo, issueid, username=None, namespace=None):
 @APP.route('/fork/<username>/<namespace>/<repo>/issue/<int:issueid>/edit',
            methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def edit_issue(repo, issueid, username=None, namespace=None):
     """ Edit the specified issue
     """
@@ -1233,7 +1225,6 @@ def edit_issue(repo, issueid, username=None, namespace=None):
 @APP.route('/fork/<username>/<namespace>/<repo>/issue/<int:issueid>/upload',
            methods=['POST'])
 @login_required
-@acquire_lock
 def upload_issue(repo, issueid, username=None, namespace=None):
     ''' Upload a file to a ticket.
     '''
@@ -1376,7 +1367,6 @@ def view_issue_raw_file(
 @APP.route('/fork/<username>/<namespace>/<repo>/issue/<int:issueid>/comment'
            '/<int:commentid>/edit', methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def edit_comment_issue(
         repo, issueid, commentid, username=None, namespace=None):
     """Edit comment of an issue
@@ -1457,7 +1447,6 @@ def edit_comment_issue(
 @APP.route(
     '/fork/<username>/<namespace>/<repo>/issues/reports', methods=['POST'])
 @login_required
-@acquire_lock
 def save_reports(repo, username=None, namespace=None):
     """ Marked for watching or Unwatching
     """
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 1915037..5e4acd5 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -51,7 +51,7 @@ import pagure.forms
 import pagure
 import pagure.ui.plugins
 from pagure import (APP, SESSION, __get_file_in_tree, login_required,
-                    admin_session_timedout, acquire_lock)
+                    admin_session_timedout)
 from pagure.lib import encoding_utils
 
 
@@ -989,7 +989,6 @@ def new_release(repo, username=None, namespace=None):
 @APP.route(
     '/fork/<username>/<namespace>/<repo>/settings', methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def view_settings(repo, username=None, namespace=None):
     """ Presents the settings of the project.
     """
@@ -1353,7 +1352,6 @@ def update_milestones(repo, username=None, namespace=None):
 @APP.route(
     '/fork/<username>/<namespace>/<repo>/default/branch/', methods=['POST'])
 @login_required
-@acquire_lock
 def change_ref_head(repo, username=None, namespace=None):
     """ Change HEAD reference
     """
@@ -1397,7 +1395,6 @@ def change_ref_head(repo, username=None, namespace=None):
 @APP.route('/fork/<username>/<repo>/delete', methods=['POST'])
 @APP.route('/fork/<username>/<namespace>/<repo>/delete', methods=['POST'])
 @login_required
-@acquire_lock
 def delete_repo(repo, username=None, namespace=None):
     """ Delete the present project.
     """
@@ -1906,7 +1903,6 @@ def add_group_project(repo, username=None, namespace=None):
 @APP.route('/fork/<username>/<repo>/regenerate', methods=['POST'])
 @APP.route('/fork/<username>/<namespace>/<repo>/regenerate', methods=['POST'])
 @login_required
-@acquire_lock
 def regenerate_git(repo, username=None, namespace=None):
     """ Regenerate the specified git repo with the content in the project.
     """
@@ -2099,7 +2095,6 @@ def revoke_api_token(repo, token_id, username=None, namespace=None):
     '/fork/<username>/<namespace>/<repo>/edit/<path:branchname>/f/'
     '<path:filename>', methods=('GET', 'POST'))
 @login_required
-@acquire_lock
 def edit_file(repo, branchname, filename, username=None, namespace=None):
     """ Edit a file online.
     """
@@ -2184,7 +2179,6 @@ def edit_file(repo, branchname, filename, username=None, namespace=None):
 @APP.route('/fork/<username>/<namespace>/<repo>/b/<path:branchname>/delete',
            methods=['POST'])
 @login_required
-@acquire_lock
 def delete_branch(repo, branchname, username=None, namespace=None):
     """ Delete the branch of a project.
     """