Clean up commit 11300:04663654f82d.