Assets 2
The fix is pretty ugly, but it should fix itself once we mocve to full
parsing.