I'll remove the check from this commit, it does not really belong here.