Clean up #1358.