Updated from commit d4c9b25b2fb80a12355b7e4ae352162345df09bf.