Reverted some of the stuff of 7a027786e6906b0dff9743ff28b120e923199fbb that was
incorrect.