Looks like this diff can be dropped now?