[[ Bug 12834 ]] Removed commented out code