This is rough. The issue with building through HS