This isn't dependant on slimmer/static branches now