Merge 3.2 and revert changes since the changes in 3.3 are a bit different