Revert some older broken changes.