Get rid of the infinite spinner.

Close #798