Revert some changes from long ago