Disable this bugfix until a better one is found