1.31 recommit - removed extra logging