Reverting Commit 908623152c11eab594457dd1e134231cd8aebe11
Trying to figure out a crash issue.