Clean up commit 422a440c9c6efadde3858063feac98d52c02a92e.