This reverts commit 2f8ff661 . Belongs into the ARM tree. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>