Revert "4.3.2 changes"

This reverts commit 036a06b2a0276a66604a8b696f2f81384a03b3a0.