Revert "Fixups 3.4.1"

This reverts commit b8120085e496137a6a3cdaec2d3d8bb7452bb211.