Actually, with the new style, we can remove this check! Probably in another bug.