see @takluyver's #5326 which this will conflict with.