Revert Temp Fix