Update for 6774ecf.