This reverts part of 91497348bf
91497348bf
I have not tracked down in detail where all these changes originate, this commit just gets things back to working again.