revert to 3.2 style