Also potentially fixes the Jupyter problem that many people are experiencing.