Yeah, I didn't know this because I run a customized nightly I forked, so I'll be keen on keeping all the files relating to this feature when I eventually merge

Yeah, I didn't know this because I run a customized nightly I forked, so I'll be keen on keeping all the files relating to this feature when I eventually merge with the upstream nightly so I can still have my cake and eat it too.