@aloof-angle-91616: mind if we revert until that can be investigated?