Revert to previous way of handling who's turn it is