This disables, at least for now, some code that was marked as 'not 100% reliable' that was breaking trunk behavior.