Revert the revert for now.