Revert "Fixing some outstanding issues with temp."

This reverts commit e579ce2a7d773c3bbb7def41e33ddbf1d0d77d0d.