We don't need the "is main" hack anymore