Removed extra class name insertion from original PR