Well, kinda fix. Upstream handles that differently here, we need a
thorough check! Add another FIXME comment because of this.