Revert "Finally made up my mind on thunk or no thunk"

This reverts commit 8ab803bad3c68504ad0f90c391f274f3a4ecba5a.