r21935: Revert obviously not sufficiently tested code -- sorry for the pain. I am...