This reverts merge request !52 (merged)
merged
mentioned in commit b11c6035
mentioned in commit eec3542a