Revert "Final Fix"

This reverts commit 832ae786d5e4339344da5324f3d74384d193ec8a.