The revert was accepted upstream, so we should be good to close this. Luiz, can you just confirm that it works again for you?