Let's compile on both for now until we hear from @AgentTroll