Updated from commit aaa4ff55be4a02789315102769d77952d9f49466.