For some reason these files weren't removed given the cherry-pick of commit #e30898718cb0197fc7bd332b69b0a255e84f33a6