Revert "Hopefully Gonna get this thing to work"

This reverts commit 3a30cad5d8b04be86677986fe7629a36febf4ac4.
Revert "Revert "Hopefully Gonna get this thing to work""

This reverts commit c67c6ec6d9b928bd836f8bc593531da0001433a6.