This reverts commit e5e42ad2.

This patch came on top of another patch that introduced a regression.
Revert it before addressing the culprit.
Signed-off-by: NBartosz Golaszewski <bgolaszewski@baylibre.com>
Tested-by: NGuenter Roeck <linux@roeck-us.net>