This reverts commit f44b7e0c.
Ad found an irregularity, so we back this out and look for a
better fix...