Revert "Add spinlock wrapper helpers"