Revert "Merge tag 'v3.4.60' into update-linux"

This reverts commit fd98210dd76d2a132cc2d757faee0496598fca92, reversing
changes made to bcdf0a14454fed2aad5fd3a10a63a8411ec484e8.