Submitted by: Ard Biesheuvel. (cherry picked from commit cd91fd7c32428c0deb503f19b8061e0980476876)
(cherry picked from commit ddb6b965da0087dadea5488fe11646e3777c66e1)