Revert "switch _new_style_lock to retry"

This reverts commit eccbdeaf713350c4f7c80b70626a62e34ad794c2.