Followup r94541 (reverts of r94289 undiscussed core schema change and followups)...