I've updated this to match the work done to fix https://github.com/kivy/kivy/issues/1580.