US oil waivers that rocked market in 2018 coming back to focus