Revert "more temp goodness"

This reverts commit 49ebbd326533cac2a6a907736c5c4321cd594c14.