Reverting master back to a pre-0.9 changes state, so that it's in a functional state