This reverts commit 24f32046a33734c657a677590e76bc96b7505533. Follow-up to #1029 -- see discussion there whyfor this commit.