Merged in 20f00058d7.