Revert "Merge tag 'v3.4.99'"

This reverts commit cd6827f54956724560b831ab457d69f883ed261b.