ergh, this hit sol10, so we need a real solution to this bug now...