[[ Bug 13048 ]] Removed commented out code