Revert "asdf"

This reverts commit 3595208c8324573af7bfe8ef6edfd12fc337253d.
Starting GCC rework
More GCC rework on items.