Re: #6255: Clean out obsolete buildroot overrides