Push fixes upstream instead of building workarounds.