This uglyness is a temporary workaround and will go away in #750 (what I will be working on next).