Clean up #4858