Restore IPython 2.x compatibility (hopefully)