revert r24989 ad r24990 which are cuasing segfaults... they were working fine for...