r6736: Revert metze's -r 6734, as metze and I made the same changes at the