Please merge if it works, and we'll find a better solution later.