[solardev]

Doesn't this mean you can't ever easily upgrade again? You have to re-fork and re-strip-out-the-things every time there's an upstream update?