Revert "Apparently not needed anyhow (?)"

This reverts commit 69261447e9579a1fa005891aa2815d9adf80f36e.