Remove 'feature' that causes lots of crashes