Revert "Fixed Header + Virtual Function Errors"

This reverts commit 4d353faa6727517afddad6aac3aa66d4a048243f.