Source: revert update for 3.4.10 and 3.4.11