Revert some recent changes, they seem to make things worse.