Revert unintended change

This partially reverts commit e2467fb7cab3bf47981d76d8bf2e724599cc5ee2.