Are these changes intended? It looks like they revert to older code?