Back to before.  We can't rely on the layer config for this apparently.