I think this will be clearer once the conversation of how to deal with compute is resolved. Changing this right now would be shooting in the dark (I think).