take over upstream changes, but keep the transitional package