Undid some breaking changes to do with paths.