all: separate our changes from upstream