Reverting await removal hack