revert and wait for upstream fix