See also 70539e18, 8167ee88, 530e7615 and fad6cb1a . Signed-off-by: Blue Swirl <blauwirbel@gmail.com>