Recommit r179497 after fixing uninitialized variable.