Temporarily revert r72620 because r72619 was reverted.