Revert wrong fixes.