Disable old hack that causes more trouble than it's worth