Revert "Rolling back to 3.2.3"

This reverts commit 33664ce8bba4129d3183076e280f2c0903c18bdc.