Revert "Revert "apply patch to fix You do not have permission to unblock <username>""

This reverts commit d71eeab2b3d6bfcd5e7361d55c486bd9a25c91d5.