Do we really still need that special case? I don't think so...