Revert to v3.2-05