Back to a stable state with this commit.