This reverts commit 16925c92.

This is no longer necessary.
Reviewed-By: NEmily Deng <Emily.Deng@amd.com>