Revert some changes that were causing problems.