This reverts commit 79e3055bab, reversing changes made to 9813aace1e. Regresison report https://lore.kernel.org/git/755578cb-07e0-4b40-aa90-aacf4d45ccaa@heusel.eu/
79e3055bab
9813aace1e