This might be no longer needed as #524 is merged