Removing code for functionality now handled by #1834