This reverts commit 95d75890f6565338782937e238d694a12e6f8bca.
mentioned in merge request !44 (closed)