Revert "Fix 3.2 rebasing"

This reverts commit 3ffeddcba138231ec222d0d455fec8e52f9e986a.