revert spinlock stuff