The previous work around to reduce dependencies is now breaking the configure stage due to changes upstream. PR: 263968