Intermediate commit to put locality back on.