Issue 20074: Removed commented code