Separated point reordering functionality, reverted openbr_plugin change such that Fork is not affected