Revert "Temp Fix"

This reverts commit e550ec4b794a95de68d04b2d9a270e3ab0b4dc07.