revert r106095, fix apparently not this simple