Revert r34541 for the moment pending further review & discussion...