Upstream bugfix affecting new installations