+ remove crude workaround as this seems to work now