Updated from commit bdb33be246bc6047469e638720476a296b40d083.