Revert "Revert "Quick Unlock (2/2): ERROR""

This reverts commit 142d7532852624bba9568e0324ba8ee300eb1b96.