This will create easily solved breakage on updates but
I figure it's best to pull the band aid off as early as possible