I've added rationale and a TODO to fix it when we have all the layers ported over in a3f0c1b.