See also facd2857 and
34005a00.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>