Wouldn't this technically have to go in 2.6?