Remove waiting-on-couch hack