Revert the revert...