(committed to the wrong branch) Attempt to fix [fb3057f6ed]. Seems to work.