Rolling back to the nice stub