Revert (unauthorized) parts of 54a89144ee1d which are not in a speed-sensitive

path in order to avoid maintenance issues.