Revert "Updates for Corret target GCC paths."

This reverts commit 4517700a72fc56ce01e879d9712e11257a43607a.