Restore #1594402 / #1661288 workarounds (aarch64 console)
    
    This reverts commit f40599ee156c2e1f5c44851f96ecd15c9ebe6f75,
    with a few tweaks. It turns out we still need these workarounds
    - see https://bugzilla.redhat.com/show_bug.cgi?id=1661288 .