Reverted a few old fixes.