problem is fixed in 3.2. Get back the partial fix from maint3.x