Well, that was silly. Tweak marmalade and add python-mode back.