reverting back the commit @4f72e6040a89369baa98838c839b2513c13679ef because we discovered that the issue wasn't related to this fix