This is done earlier now, see the previous comment.