Rollback to 3.2.1