Make a proper fix for the wakeup problem this time (by punting).