Cleanup related to 56ca92a78d