Updated from commit 7bccb77a952788b3b92a9a882edb06e2d9c927ce.