Pillow doesn't work for Whiskey, do not merge upstream!!