Updated from commit bdfefb5b5f47e93a3081c1e0ecf25d0fe8dfc031.