get back parts of 88bf1e2 (readd §)