Switch to using provided simple Riemann solver